[codegen] Convert all jennies to use `codegen.AppManifest` by IfSentient · Pull Request #1265 · grafana/grafana-app-sdk

IfSentient · 2026-02-24T15:02:24Z

What Changed? Why?

This PR converts all jennies still using codegen.Kind over to using codegen.AppManifest, and deprecates codegen.Kind. Currently, as we continue to add jennies, they have to end up in generators that are using codegen.AppManifest, and don't always fit in that space (see the go client jenny as an example, which is in the manifest generator instead of the resource one that generates all other gotype code). This change allows us to more intelligently group jennies in the future, and move the codegen model over entirely to be AppManifest-based.

How was it tested?

Codegen tests to ensure output didn't change, and created and built a new project to make sure the project codegen was still accurate.

Where did you document your changes?

N/A - no user-facing changes.

Notes to Reviewers

…d of codegen.Kind.

… codegen.Kind

…nstead of codegen.Kind

…egen.Kind

IfSentient · 2026-02-24T15:03:53Z

cmd/grafana-app-sdk/templates/Makefile.tmpl

 build/operator:
 ifeq ("$(wildcard cmd/operator/Dockerfile)","cmd/operator/Dockerfile")
-    docker build -t $(OPERATOR_DOCKERIMAGE) -f cmd/operator/Dockerfile .
+	docker build -t $(OPERATOR_DOCKERIMAGE) -f cmd/operator/Dockerfile .


Drive-by that I noticed when doing new project testing--this was four spaces instead of a tab.

codegen/jennies/backendplugin.go

amalavet · 2026-02-24T16:25:40Z

codegen/jennies/backendplugin.go

+	for _, version := range appManifest.Versions() {
+		if version.Name() != appManifest.Properties().PreferredVersion {
+			continue
+		}
+		for _, kind := range version.Kinds() {
+			tmd.Resources = append(tmd.Resources, versionedKindToKindProperties(kind, appManifest))
+			if appManifest.Properties().FullGroup != "" {
+				tmd.PluginID = strings.Split(appManifest.Properties().FullGroup, ".")[0]
+			}


this is somewhat similar to the logic for getting the tmd.Resources from the manifest that you did in app generator. Can we extract this logic and potentially pass the props to the Generate func, or create a helper func that does this? That way we only do one pass through the kinds. It does seem that there are some minute differences that could make this tricky, but just an idea.

The KindProperties stuff should probably also be overhauled in the future--for now I didn't want to change the templates in this PR.

amalavet · 2026-02-24T16:30:41Z

codegen/jennies/codec.go

+	for _, version := range appManifest.Versions() {
+		for _, kind := range version.Kinds() {


just an idea, but could we create an func that returns an iterator to reduce this nested loop, which you use a lot throughout this PR i.e.

Suggested change

for _, version := range appManifest.Versions() {

for _, kind := range version.Kinds() {

for version, kind := range ManifestKindVersions(appManifest))) {

func ManifestKindVersions(m AppManifest) iter.Seq2[Version, VersionedKind] { return func(yield func(Version, VersionedKind) bool) { for _, version := range m.Versions() { for _, kind := range version.Kinds() { if !yield(version, kind) { return } } } } }

Added codegen.VersionedKinds and codegen.PreferredVersionKinds using iter.Seq2. Good suggestion, I keep forgetting about the iterator stuff that go introduced, and this is a great place to use it.

amalavet · 2026-02-24T16:33:43Z

codegen/jennies/codec.go

+			if kind.Scope != string(resource.NamespacedScope) && kind.Scope != string(resource.ClusterScope) {
+				return nil, fmt.Errorf("scope '%s' is invalid, must be one of: '%s', '%s'",
+					kind.Scope, resource.ClusterScope, resource.NamespacedScope)
+			}


nit; maybe you could use a helper func for this scope check?

codegen/jennies/crd.go

amalavet · 2026-02-24T16:46:07Z

codegen/jennies/operator.go

@@ -134,10 +146,6 @@ func (o *operatorMainJenny) Generate(kinds ...codegen.Kind) (*codejen.File, erro
 		KindsAreGrouped: !o.groupByKind,
 	}

-	for _, kind := range kinds {
-		tmd.Resources = append(tmd.Resources, kind.Properties())
-	}
-


Why can you just remove this?

Resources isn't used in the template, I forgot to remove it from the metadata as well, let me fix that.

amalavet · 2026-02-24T16:49:35Z

codegen/jennies/resourceobject.go

+			files = append(files, codejen.File{
+				RelativePath: filepath.Join(GetGeneratedGoTypePath(r.GroupByKind, appManifest.Properties().Group, version.Name(), kind.MachineName), fmt.Sprintf("%s_object_gen.go", strings.ToLower(kind.MachineName))),
+				Data:         b,
+				From:         []codejen.NamedJenny{r},
 			})


nit; just a little cleaner to follow

Suggested change

files = append(files, codejen.File{

RelativePath: filepath.Join(GetGeneratedGoTypePath(r.GroupByKind, appManifest.Properties().Group, version.Name(), kind.MachineName), fmt.Sprintf("%s_object_gen.go", strings.ToLower(kind.MachineName))),

Data: b,

From: []codejen.NamedJenny{r},

})

typePath := GetGeneratedGoTypePath(r.GroupByKind, appManifest.Properties().Group, version.Name(), kind.MachineName)

suffix := fmt.Sprintf("%s_object_gen.go", strings.ToLower(kind.MachineName))

files = append(files, codejen.File{

RelativePath: filepath.Join(typePath, suffix),

Data: b,

From: []codejen.NamedJenny{r},

})

codegen/jennies/routercode.go

codegen/jennies/schema.go

amalavet · 2026-02-24T16:53:35Z

codegen/kind.go

 // Any type parser should be able to parse a kind into this definition to supply
 // to various common Jennies in the codegen package.
+// Deprecated: use AppManifest instead
 type Kind interface {


This is still being used in some places, any reason why not removing it across the repo?

The only place left that still uses it AFAICT are the parsers, which are exported. I'll deprecate the KindParser, but given that it's an exported type, I want ot leave it present and deprecated for a few releases just in case anyone is using it.

…en.Kind, create convenience iterator functions in the codegen package for iterating through versions+kinds in order, other small fixes based on PR comments.

IfSentient added 6 commits February 23, 2026 14:59

Updated all of the resource jennies to use codegen.AppManifest instea…

e13c441

…d of codegen.Kind.

Convert CRD jenny and generator to use codegen.AppManifest instead of…

34c4c5d

… codegen.Kind

Convert the OpenAPI post-processor jenny to use codegen.AppManifest i…

8b87092

…nstead of codegen.Kind

Move project jennies over to using codegen.AppManifest instead of cod…

5b6ea85

…egen.Kind

Mark codegen.Kind as deprecated

1d7aab3

misc. bugfixes from testing building a new project from scratch.

6b24064

IfSentient requested a review from a team as a code owner February 24, 2026 15:02

IfSentient requested review from ferruvich and konsalex February 24, 2026 15:02

IfSentient commented Feb 24, 2026

View reviewed changes

amalavet reviewed Feb 24, 2026

View reviewed changes

IfSentient added 3 commits February 24, 2026 16:01

Update TypeScript jennies to use codegen.AppManifest instead of codeg…

f7f4dea

…en.Kind, create convenience iterator functions in the codegen package for iterating through versions+kinds in order, other small fixes based on PR comments.

Update comments.

b6c695b

Deprecate KindParser.

51b5375

amalavet self-requested a review February 25, 2026 19:46

amalavet approved these changes Feb 25, 2026

View reviewed changes

IfSentient merged commit 03a4875 into main Feb 25, 2026
16 checks passed

IfSentient deleted the update-kind-jennies branch February 25, 2026 19:48

		for _, version := range appManifest.Versions() {
		for _, kind := range version.Kinds() {

	for _, version := range appManifest.Versions() {
	for _, kind := range version.Kinds() {
	for version, kind := range ManifestKindVersions(appManifest))) {

Conversation

IfSentient commented Feb 24, 2026

What Changed? Why?

How was it tested?

Where did you document your changes?

Notes to Reviewers

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

amalavet Feb 24, 2026 • edited Loading Uh oh! There was an error while loading. Please reload this page.

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Choose a reason for hiding this comment

Uh oh!

Uh oh!

Reviewers

Assignees

Labels

Projects

Milestone

Development

Uh oh!

2 participants

amalavet Feb 24, 2026 •

edited

Loading